Merge branch 'inspector-menu-fix' into 'master'

Inspector menu fix

See merge request GNOME/gtk!804

diff --cc gtk/gtkmenu.c
index f7d3ab2ff28abbf03da6905aed2faf3b32fd5337,bfb2a2ae7151bfe4279c6b1627df7cca35db717a..510e204b6d8a7bdd85190c226feec42956c1092d
--- 1/gtk/gtkmenu.c
--- 2/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@@ -1050,9 -1050,19 +1050,18 @@@ attach_widget_display_changed (GtkWidge
                                 GdkDisplay *previous_display,
                                 GtkMenu    *menu)
  {
 -  if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-display"))
 -    menu_change_display (menu, gtk_widget_get_display (attach_widget));
 +  menu_change_display (menu, gtk_widget_get_display (attach_widget));
  }
  
+ static void
+ attach_widget_root_changed (GObject    *attach_widget,
+                             GParamSpec *pspec,
+                             gpointer    menu)
+ {
+   if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-display"))
+     menu_change_display (menu, gtk_widget_get_display (GTK_WIDGET (attach_widget)));
+ }
+ 
  static void
  menu_toplevel_attached_to (GtkWindow *toplevel, GParamSpec *pspec, GtkMenu *menu)
  {